From: Konrad Rzeszutek Wilk Date: Fri, 8 Mar 2013 15:21:03 +0000 (+0100) Subject: x86/vPMU: add missing Merom, Westmere, and Nehalem models X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~7131 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=3f7eb639b7ef1c050f5081e432bbb54c53f43ecb;p=xen.git x86/vPMU: add missing Merom, Westmere, and Nehalem models Mainly 22 (Merom-L); 30 (Nehelem); and 37, 44 (Westmere). A comprehensive list is available at: http://software.intel.com/en-us/articles/intel-architecture-and-processor-identification-with-cpuid-model-and-family-numbers Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Jun Nakajima --- diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 4d33231dfc..eb595cd228 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -738,14 +738,25 @@ int vmx_vpmu_initialise(struct vcpu *v, unsigned int vpmu_flags) { switch ( cpu_model ) { + /* Core2: */ case 15: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ + case 22: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */ case 23: /* 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */ - case 26: /* 45 nm nehalem, "Bloomfield" */ case 29: /* six-core 45 nm xeon "Dunnington" */ + case 42: /* SandyBridge */ case 45: /* SandyBridge, "Romley-EP" */ + + /* Nehalem: */ + case 26: /* 45 nm nehalem, "Bloomfield" */ + case 30: /* 45 nm nehalem, "Lynnfield", "Clarksfield", "Jasper Forest" */ case 46: /* 45 nm nehalem-ex, "Beckton" */ - case 47: /* 32 nm Xeon E7 */ + + /* Westmere: */ + case 37: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ + case 44: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ + case 47: /* 32 nm Westmere-EX */ + case 58: /* IvyBridge */ case 62: /* IvyBridge EP */ ret = core2_vpmu_initialise(v, vpmu_flags);